Module fixes for Windows #1816
Merged
Module fixes for Windows #1816
+143
−64
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
edaniels
commented
Jan 30, 2023
| if m.parent != nil { | ||
| if err := m.parent.Close(ctx); err != nil { | ||
| m.closeOnce.Do(func() { | ||
| m.mu.Lock() |
There was a problem hiding this comment.
in windows we were shutting this process down too quickly because of how process groping and CtrlC works there (changed that in goutils now so this doesn't get hit). this makes sure we don't hold the lock and cause a race where RemoveResource is happening while Closing (happened a lot in Windows)
edaniels
commented
Jan 30, 2023
| @@ -379,6 +385,12 @@ func (m *Module) ReconfigureResource(ctx context.Context, req *pb.ReconfigureRes | |||
|
|
|||
| // RemoveResource receives the request for resource removal. | |||
| func (m *Module) RemoveResource(ctx context.Context, req *pb.RemoveResourceRequest) (*pb.RemoveResourceResponse, error) { | |||
| slowWatcher, slowWatcherCancel := utils.SlowGoroutineWatcher( | |||
There was a problem hiding this comment.
this will dump stacks after 30 seconds if this function doesn't end by then
edaniels
commented
Jan 30, 2023
| @@ -154,10 +154,15 @@ func (s *robotServer) runServer(ctx context.Context) error { | |||
| } | |||
| cancel() | |||
|
|
|||
| slowWatcher, slowWatcherCancel := utils.SlowGoroutineWatcherAfterContext( | |||
There was a problem hiding this comment.
this will dump stacks after 90 seconds if this function doesn't end by then
viambot
added
the
safe to test
viambot
added
safe to test
Otterverse
approved these changes
Jan 30, 2023
| @@ -260,7 +260,7 @@ func (m *module) checkReady(ctx context.Context, parentAddr string) error { | |||
| } | |||
|
|
|||
| func (m *module) startProcess(ctx context.Context, parentAddr string, logger golog.Logger) error { | |||
| m.addr = filepath.Dir(parentAddr) + "/" + m.name + ".sock" | |||
| m.addr = filepath.ToSlash(filepath.Join(filepath.Dir(parentAddr), m.name+".sock")) | |||
There was a problem hiding this comment.
I should've done that in the first place... I literally had the thought, then "no, we don't support windows anyway, so a simple slash literal is more readable"
|
Closed
randhid
pushed a commit
to randhid/rdk
that referenced
this pull request
Feb 25, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This also adds a neat little stack dumper when things fail to close in time